Skip to content

[baseline][flatbuffers] backport fixes for Abseil and C++11#29974

Merged
dan-shaw merged 3 commits intomicrosoft:masterfrom
coryan:flatbuffers-fix-abseil-auto-detection
Mar 6, 2023
Merged

[baseline][flatbuffers] backport fixes for Abseil and C++11#29974
dan-shaw merged 3 commits intomicrosoft:masterfrom
coryan:flatbuffers-fix-abseil-auto-detection

Conversation

@coryan
Copy link
Contributor

@coryan coryan commented Mar 2, 2023 •
edited
Loading

Pulls google/flatbuffers#7824 from upstream. As discussed in #29792. Fixes #30004

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@coryan coryan marked this pull request as ready for review March 2, 2023 18:01
@coryan coryan mentioned this pull request Mar 2, 2023
Merged
7 tasks
@dg0yt dg0yt mentioned this pull request Mar 2, 2023
Merged
@JonLiu1993 JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Mar 3, 2023
JonLiu1993
JonLiu1993 reviewed Mar 3, 2023
View reviewed changes
@coryan coryan mentioned this pull request Mar 3, 2023
Closed
JackBoosY
JackBoosY approved these changes Mar 6, 2023
View reviewed changes
ports/flatbuffers/fix-abseil-cxx14.patch
@@ -0,0 +1,13 @@
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
Copy link
Contributor

@JackBoosY JackBoosY Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was merged in the upstream PR google/flatbuffers#7824.

@JonLiu1993 JonLiu1993 changed the title [flatbuffers] backport fixes for Abseil and C++11 [baseline][flatbuffers] backport fixes for Abseil and C++11 Mar 6, 2023
@JonLiu1993 JonLiu1993 added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Mar 6, 2023
@dan-shaw dan-shaw merged commit 3d5aa84 into microsoft:master Mar 6, 2023
@coryan coryan deleted the flatbuffers-fix-abseil-auto-detection branch March 8, 2023 16:38
@jimwang118 jimwang118 mentioned this pull request Mar 14, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@talregev talregev talregev left review comments

@JackBoosY JackBoosY JackBoosY approved these changes

@JonLiu1993 JonLiu1993 JonLiu1993 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JonLiu1993 JonLiu1993

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[flatbuffers] downstream deps break (e.g. mnn) if Abseil is installed

5 participants

@coryan @talregev @JackBoosY @JonLiu1993 @dan-shaw